Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade host-ctr dependencies including containerd #2717

Merged
merged 2 commits into from
Jan 10, 2023
Merged

Upgrade host-ctr dependencies including containerd #2717

merged 2 commits into from
Jan 10, 2023

Conversation

jpmcb
Copy link
Contributor

@jpmcb jpmcb commented Jan 10, 2023

Issue number:

N/a

Description of changes:

- host-ctr: Upgrade Go dependencies
- containerd: Upgrade package to 1.6.15

Testing done:

Able to build Bottlerocket locally.

In depth testing on ECS and K8s incoming.

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

@jpmcb jpmcb requested a review from etungsten January 10, 2023 00:13
etungsten
etungsten approved these changes Jan 10, 2023
View reviewed changes
Copy link
Contributor

@etungsten etungsten left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGMT if testing passes

@jpmcb
Copy link
Contributor Author

jpmcb commented Jan 10, 2023

ECS testing

Built and deployed an ecs variant. It joined my default ecs cluster and I was able to ssm to execute:

  • Host containers status
$ systemctl status host-containers@admin
● [email protected] - Host container: admin
     Loaded: loaded (/x86_64-bottlerocket-linux-gnu/sys-root/usr/lib/systemd/system/[email protected]; enabled; vendor preset: enabled)
     Active: active (running) since Tue 2023-01-10 00:56:22 UTC; 18s ago
   Main PID: 2020 (host-ctr)
      Tasks: 8 (limit: 4565)
     Memory: 21.2M
     CGroup: /system.slice/system-host\x2dcontainers.slice/[email protected]
             └─2020 /usr/bin/host-ctr run --container-id=admin --source=328549459982.dkr.ecr.us-west-2.amazonaws.com/bottlerocket-admin:v0.9.3 --superpowered=true --registry-config=/etc/host-containers/host-ctr.toml
  • launched container
bash-5.1# ctr images pull docker.io/library/hello-world:latest
...

bash-5.1# ctr run --rm -t docker.io/library/hello-world:latest my-test-container

Hello from Docker!
...

K8s testing

Built and deployed a K8s variant and added a node to my cluster. Attached and workloads scheduled on it.

  • Host containers status
ash-5.1# systemctl status host-containers@admin
● [email protected] - Host container: admin
     Loaded: loaded (/x86_64-bottlerocket-linux-gnu/sys-root/usr/lib/systemd/system/[email protected]; enabled; vendor preset: enabled)
     Active: active (running) since Tue 2023-01-10 01:22:20 UTC; 21s ago
   Main PID: 1410 (host-ctr)
      Tasks: 9 (limit: 9265)
     Memory: 18.5M
     CGroup: /system.slice/system-host\x2dcontainers.slice/[email protected]
             └─1410 /usr/bin/host-ctr run --container-id=admin --source=328549459982.dkr.ecr.us-west-2.amazonaws.com/bottlerocket-admin:v0.9.3 --superpowered=true --registry-config=/etc/host-containers/host-ctr.toml
  • Run container
bash-5.1# ctr images pull docker.io/library/hello-world:latest
...

bash-5.1# ctr run --rm -t docker.io/library/hello-world:latest my-test-container

Hello from Docker!
...

@jpmcb jpmcb merged commit 38c4137 into bottlerocket-os:develop Jan 10, 2023
@jpmcb jpmcb deleted the upgrade-containerd-host-ctr branch January 10, 2023 16:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@etungsten etungsten etungsten approved these changes

@jpculp jpculp jpculp approved these changes

@stmcginnis stmcginnis stmcginnis approved these changes

@bcressey bcressey bcressey approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@jpmcb @bcressey @stmcginnis @jpculp @etungsten